Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 04:02:53 +0000 (21:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 15 Sep 2011 04:02:53 +0000 (21:02 -0700)
commit69e8dc940f0da5efa8eab03e2dbdc03b208e213b
tree507f0b5d9b9ab8657f73ec72cf0eb93d5c7b8c73
parente85ea2b74c84ff387248b70a7831fc4da92a2a8c
parent07a99f6f7cdb57a8259b855ec3531843252846c5
Merge from trunk.